Fix sync loop for too long path - #316
Open
harminius wants to merge 9 commits into
Open
Conversation
harminius
changed the title
Contributor
Author
Contributor
Author
|
db paths look fine |
harminius
changed the title
Coverage Report for CI Build 32106134036Coverage decreased (-0.02%) to 83.368%Details
Uncovered Changes
Coverage Regressions1 previously-covered line in 1 file lost coverage.
Coverage Stats
💛 - Coveralls |
varmar05
requested changes
Aug 18, 2026
| prefix = backslash + backslash + "?" + backslash | ||
| if path.startswith(prefix): | ||
| return path | ||
| return prefix + os.path.abspath(path) |
Contributor
There was a problem hiding this comment.
So this is only for local handling of files but it will never end up in relative paths for files in DB (we need this to work for all clients)?
| diffs = [] | ||
| for v in versions_to_fetch[1:]: | ||
| diffs.append(mp.fpath_cache(file_history["history"][v]["diff"]["path"], v)) | ||
| diffs.append(long_path(mp.fpath_cache(file_history["history"][v]["diff"]["path"], v))) |
Contributor
There was a problem hiding this comment.
Using some patch function for a lot of os.paths hanging around in the code seems fragile to me. It can easily slip and we might forgot to use in future. I think we need to come up with some generic handler, single place which will make sure all paths are correct in whole code base.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes MerginMaps/qgis-plugin#932
Use \\?\-prefixed paths for geodiff calls and other file I/O.
Debugging info:
Pull works as py-client saves the diffs to tmp dir
However, there is always a check if there's something to push after the pull.
Push treats every gpkg with editing mode enabled as well as with original vs. current gpkg checksum mismatch (which is quite common) as potentially updated, and we rely on geodiff to calculate the real changes. Geodiff creates an empty diff file even when there is no change.
Geodiff's create_changeset() fails because it's not possible to create a file due to the Windows path length limit. It then pushes the whole file. Then we want to apply the push changes to the basefile. So geodiff removes the original geopackage and copies the current copy, which apparently changes the checksum, and we're caught in the loop. ➿
This is a minimal fix for the issue. There are other enhancements/issue mitigations:- Shorten diff name
Path
Length
Live file <rel>
P + R + 1
Basefile .mergin<rel> — already mandatory today
P + R + 9
Diff today .mergin<rel>-diff-
P + R + 51
Diff flattened .mergin\diffs<uuid>
P + 51 (constant)
Same, 16-char id
P + 31 (constant)
- Safeguard for any infinite sync loop
Store diff files locally under a short, flat name, decoupled from the file's path in the project — e.g. .mergin/diffs/ instead of .mergin/-diff-. Fixes works esp. for files nested deep in the subfolders. This does not require server changes - the server doesn't care what we call the local file.
sync_project_generator'swhile has_changeshas no iteration limit. Track, per file, how many consecutive iterations it was pushed as a full upload with no diff; if the same versioned file does this N times in a row (e.g. 2–3), raise a ClientError naming the file instead of continuing. This is cause-agnostic - it also protects against any other future reason a changeset can't be computed.Use
\\?\-prefixed paths for geodiff calls and other file I/O.4. Use a temp folder for push diffs, as it is used for pull diffs already.